TAGs: add fillable fields